From 63eb3517be7b812759ecc663b667432532174ffe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Sun, 8 Oct 2017 17:38:38 +0200 Subject: [PATCH] GdkDisplay: Add a private _emit_opened So we don't have to use the slower g_signal_emit_by_name in startup paths. --- gdk/gdkdisplay.c | 6 ++++++ gdk/gdkdisplayprivate.h | 1 + gdk/wayland/gdkdisplay-wayland.c | 2 +- gdk/x11/gdkdisplay-x11.c | 3 ++- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c index 6d45b078b1..5e75773dae 100644 --- a/gdk/gdkdisplay.c +++ b/gdk/gdkdisplay.c @@ -2217,3 +2217,9 @@ gdk_display_monitor_removed (GdkDisplay *display, g_signal_emit (display, signals[MONITOR_REMOVED], 0, monitor); gdk_monitor_invalidate (monitor); } + +void +gdk_display_emit_opened (GdkDisplay *display) +{ + g_signal_emit (display, signals[OPENED], 0); +} diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h index a0d9dc23fd..cd3ef346d1 100644 --- a/gdk/gdkdisplayprivate.h +++ b/gdk/gdkdisplayprivate.h @@ -301,6 +301,7 @@ void gdk_display_monitor_added (GdkDisplay *display GdkMonitor *monitor); void gdk_display_monitor_removed (GdkDisplay *display, GdkMonitor *monitor); +void gdk_display_emit_opened (GdkDisplay *display); G_END_DECLS diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c index 31e19359c6..2154e5101e 100644 --- a/gdk/wayland/gdkdisplay-wayland.c +++ b/gdk/wayland/gdkdisplay-wayland.c @@ -584,7 +584,7 @@ _gdk_wayland_display_open (const gchar *display_name) display_wayland->selection = gdk_wayland_selection_new (); - g_signal_emit_by_name (display, "opened"); + gdk_display_emit_opened (display); return display; } diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index 74c0ecf5f0..cc34d8cd43 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -42,6 +42,7 @@ #include "gdkglcontext-x11.h" #include "gdkvulkancontext-x11.h" #include "gdk-private.h" +#include "gdkdisplayprivate.h" #include #include @@ -1780,7 +1781,7 @@ _gdk_x11_display_open (const gchar *display_name) gdk_display_set_composited (GDK_DISPLAY (display), XGetSelectionOwner (GDK_DISPLAY_XDISPLAY (display), get_cm_atom (display)) != None); - g_signal_emit_by_name (display, "opened"); + gdk_display_emit_opened (display); return display; } -- 2.30.2